merge_driver_ekeyword: Add test for merging commits that touch the same keyword #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…me keyword Unsure what the behavior should be. Currently the result depends on the order of the commits being merged. maybe this is reasonable? Seems a bit scary.
|
(The new test is expected to fail) cc: @thesamesam I'm thinking that maybe the right thing to do is: nothing. If we're merging commits that modify the same keyword, we should leave a real conflict in the file. |
thesamesam
reviewed
Jun 27, 2024
There was a problem hiding this comment.
Yeah, I think you're right -- we don't want to resolve it. If someone added "-x86" because it turns out to be broken but I have some generic AT commit adding x86 because a compile test passed and it has no testsuite, I don't want that fixed up for me.
We could maybe have an aggressive mode or something but I don't think there's much of an audience for that
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unsure what the behavior should be. Currently the result depends on the order of the commits being merged. maybe this is reasonable? Seems a bit scary.